bitkeeper revision 1.539.1.1 (3f9ffd56ju-qX7ro1SVzJmd1_pp1sg)

temporary fix

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index e51474b789e8d69988aceff9154648cc33b4940f..33a9945db7026a596de9019cefab79d6dee534c2 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -474,3 +474,8 @@ tools/misc/xen_read_console
 extras/mini-os/h/hypervisor-ifs
 xen/BLOG
 xen/drivers/block/xen_vbd.o
+tools/internal/xi_vif_params
+tools/misc/xen_cpuperf
+tools/misc/xen_log
+tools/misc/xen_refresh_dev
+xenolinux-2.4.22-sparse/arch/xeno/drivers/block/device

diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c
index 967a1c21b9d4222f8df2ef0d66e7704915982267..e3daf43ae408c0ae2836654f5838e38ace4ba254 100644 (file)
--- a/xen/drivers/block/xen_block.c
+++ b/xen/drivers/block/xen_block.c
@@ -583,11 +583,15 @@ static void dispatch_probe(struct task_struct *p, int index)
     */
     xdi = map_domain_mem(buffer);
     xdi->count = 0; 
+#if 0 // XXX SMH: fix below once done proper vbd/physd rewrit
     if(IS_PRIV(p)) { 
+#endif
        /* privilege domains always gets access to the 'real' devices */
        ide_probe_devices(xdi);
        scsi_probe_devices(xdi);
+#if 0
     } 
+#endif
     vbd_probe_devices(xdi, p); 
     unmap_domain_mem(xdi);